X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=9ba549efec3a9a97cd885813273ece2d7d5e6393;hb=a30d4319a57cdf118e0d77162a4f8ca2dff9eab7;hp=f2c3b3366d4e8fca91ad5c2a1aff025e430d6786;hpb=1fcfd134d15d17c89894094b5dc38f29f83e95e9;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index f2c3b3366d..9ba549efec 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -281,17 +281,14 @@ $wgAllowImageMoving = true; $wgIllegalFileChars = ":"; /** - * New file storage paths; currently used only for deleted files. - * Set it like this: - * - * $wgFileStore['deleted']['directory'] = '/var/wiki/private/deleted'; + * @deprecated use $wgDeletedDirectory */ $wgFileStore = array(); -/** @cond file_level_code */ -$wgFileStore['deleted']['directory'] = false; // Defaults to $wgUploadDirectory/deleted -$wgFileStore['deleted']['url'] = null; // Private -$wgFileStore['deleted']['hash'] = 3; // 3-level subdirectory split -/** @endcond */ + +/** + * What directory to place deleted uploads in + */ +$wgDeletedDirectory = false; // Defaults to $wgUploadDirectory/deleted /** * Set this to true if you use img_auth and want the user to see details on why access failed. @@ -342,9 +339,11 @@ $wgImgAuthPublicTest = true; * * These settings describe a foreign MediaWiki installation. They are optional, and will be ignored * for local repositories: - * - descBaseUrl URL of image description pages, e.g. http://en.wikipedia.org/wiki/Image: + * - descBaseUrl URL of image description pages, e.g. http://en.wikipedia.org/wiki/File: * - scriptDirUrl URL of the MediaWiki installation, equivalent to $wgScriptPath, e.g. - * http://en.wikipedia.org/w + * http://en.wikipedia.org/w + * - scriptExtension Script extension of the MediaWiki installation, equivalent to + * $wgScriptExtension, e.g. .php5 defaults to .php * * - articleUrl Equivalent to $wgArticlePath, e.g. http://en.wikipedia.org/wiki/$1 * - fetchDescription Fetch the text of the remote file description page. Equivalent to @@ -400,7 +399,7 @@ $wgRemoteUploads = false; * Uploads to this wiki will NOT be put there - they will be put into * $wgUploadDirectory. * If $wgUseSharedUploads is set, the wiki will look in the shared repository if - * no file of the given name is found in the local repository (for [[Image:..]], + * no file of the given name is found in the local repository (for [[File:..]], * [[Media:..]] links). Thumbnails will also be looked for and generated in this * directory. * @@ -426,6 +425,11 @@ $wgCacheSharedUploads = true; * The timeout for copy uploads is set by $wgHTTPTimeout. */ $wgAllowCopyUploads = false; +/** + * Allow asynchronous copy uploads. + * This feature is experimental. + */ +$wgAllowAsyncCopyUploads = false; /** * Max size for uploads, in bytes. Applies to all uploads. @@ -437,12 +441,16 @@ $wgMaxUploadSize = 1024*1024*100; # 100MB * Useful if you want to use a shared repository by default * without disabling local uploads (use $wgEnableUploads = false for that) * e.g. $wgUploadNavigationUrl = 'http://commons.wikimedia.org/wiki/Special:Upload'; - * - * This also affects images inline images that do not exist. In that case the URL will get - * (?|&)wpDestFile= appended to it as appropriate. */ $wgUploadNavigationUrl = false; +/** + * Point the upload link for missing files to an external URL, as with + * $wgUploadNavigationUrl. The URL will get (?|&)wpDestFile= + * appended to it as appropriate. + */ +$wgUploadMissingFileUrl = false; + /** * Give a path here to use thumb.php for thumbnail generation on client request, instead of * generating them on render and outputting a static URL. This is necessary if some of your @@ -483,7 +491,7 @@ $wgHashedSharedUploadDirectory = true; * * Please specify the namespace, as in the example below. */ -$wgRepositoryBaseUrl = "http://commons.wikimedia.org/wiki/Image:"; +$wgRepositoryBaseUrl = "http://commons.wikimedia.org/wiki/File:"; /** * This is the list of preferred extensions for uploading files. Uploading files @@ -540,7 +548,7 @@ $wgUploadSizeWarning = false; /** * list of trusted media-types and mime types. * Use the MEDIATYPE_xxx constants to represent media types. - * This list is used by Image::isSafeFile + * This list is used by File::isSafeFile * * Types not listed here will have a warning about unsafe content * displayed on the images description page. It would also be possible @@ -1123,6 +1131,14 @@ $wgDBprefix = ''; /** MySQL table options to use during installation or update */ $wgDBTableOptions = 'ENGINE=InnoDB'; +/** + * SQL Mode - default is turning off all modes, including strict, if set. + * null can be used to skip the setting for performance reasons and assume + * DBA has done his best job. + * String override can be used for some additional fun :-) + */ +$wgSQLMode = ''; + /** Mediawiki schema */ $wgDBmwschema = 'mediawiki'; /** Tsearch2 schema */ @@ -1411,7 +1427,7 @@ $wgCacheDirectory = false; * - CACHE_NONE: Do not cache * - CACHE_DB: Store cache objects in the DB * - CACHE_MEMCACHED: MemCached, must specify servers in $wgMemCacheServers - * - CACHE_ACCEL: eAccelerator + * - CACHE_ACCEL: eAccelerator, APC, XCache or WinCache * - CACHE_DBA: Use PHP's DBA extension to store in a DBM-style * database. This is slow, and is not recommended for * anything other than debugging. @@ -1540,7 +1556,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches do not keep obsolete copies of global * styles. */ -$wgStyleVersion = '291'; +$wgStyleVersion = '299'; /** * This will cache static pages for non-logged-in users to reduce @@ -1769,6 +1785,18 @@ $wgFixArabicUnicode = true; */ $wgFixMalayalamUnicode = true; +/** + * Set this to always convert certain Unicode sequences to modern ones + * regardless of the content language. This has a small performance + * impact. + * + * See $wgFixArabicUnicode and $wgFixMalayalamUnicode for conversion + * details. + * + * @since 1.17 + */ +$wgAllUnicodeFixes = false; + /** * Set this to eg 'ISO-8859-1' to perform character set conversion when * loading old revisions not marked with "utf-8" flag. Use this when @@ -2109,7 +2137,7 @@ $wgValidateAllHtml = false; /** * Default skin, for new users and anonymous visitors. Registered users may * change this to any one of the other available skins in their preferences. - * This have to be completely lowercase; see the "skins" directory for the list + * This has to be completely lowercase; see the "skins" directory for the list * of available skins. */ $wgDefaultSkin = 'vector'; @@ -2263,6 +2291,12 @@ $wgVectorExtraStyles = null; */ $wgEdititis = false; +/** + * Experimental better directionality support. + */ +$wgBetterDirectionality = false; + + /** @} */ # End of output format settings } /*************************************************************************//** @@ -2690,6 +2724,14 @@ $wgUseCommaCount = false; */ $wgHitcounterUpdateFreq = 1; +/** + * How many days user must be idle before he is considered inactive. Will affect + * the number shown on Special:Statistics and Special:ActiveUsers special page. + * You might want to leave this as the default value, to provide comparable + * numbers between different wikis. + */ +$wgActiveUserDays = 30; + /** @} */ # End of statistics } /************************************************************************//** @@ -2728,6 +2770,7 @@ $wgReservedUsernames = array( 'Template namespace initialisation script', // Used in 1.2->1.3 upgrade 'msg:double-redirect-fixer', // Automatic double redirect fix 'msg:usermessage-editor', // Default user for leaving user messages + 'msg:proxyblocker', // For Special:Blockme ); /** @@ -2766,7 +2809,6 @@ $wgDefaultUserOptions = array( 'imagesize' => 2, 'justify' => 0, 'math' => 1, - 'minordefault' => 0, 'newpageshidepatrolled' => 0, 'nocache' => 0, 'noconvertlink' => 0, @@ -2853,7 +2895,7 @@ $wgExternalAuthType = null; * info be provided. Check the file where your auth mechanism is defined for * info on what to put here. */ -$wgExternalAuthConfig = array(); +$wgExternalAuthConf = array(); /** * When should we automatically create local accounts when external accounts @@ -3707,9 +3749,9 @@ $wgParserTestRemote = false; */ $wgEnableSelenium = false; -/** List of Selenium test classes. These must be registered with the autoloader. */ -$wgSeleniumTests = array( - 'SimpleSeleniumTest' +/** List of Selenium test suites. These must be registered with the autoloader. */ +$wgSeleniumTestSuites = array( + 'SimpleSeleniumTestSuite' ); @@ -4154,6 +4196,11 @@ $wgRightsUrl = null; $wgRightsText = null; $wgRightsIcon = null; +/** + * Set to an array of metadata terms. Else they will be loaded based on $wgRightsUrl + */ +$wgLicenseTerms = false; + /** Set this to some HTML to override the rights icon with an arbitrary logo */ $wgCopyrightIcon = null; @@ -4420,10 +4467,12 @@ $wgCategoryMagicGallery = true; $wgCategoryPagingLimit = 200; /** - * Should the default category sortkey be the prefixed title? - * Run maintenance/refreshLinks.php after changing this. + * A version indicator for collations that will be stored in cl_collation for + * all new rows. Used when the collation algorithm changes: a script checks + * for all rows where cl_collation != $wgCollationVersion and regenerates + * cl_sortkey based on the page name and cl_sortkey_prefix. */ -$wgCategoryPrefixedDefaultSortkey = true; +$wgCollationVersion = 1; /** @} */ # End categories }